Version numbers, refactoring