Minor refactoring
Updated version number