Initial commit
Minor refactoring