Version update
Minor refactoring