Refactor version number