Refactor version