Bump version nr, little refactoring