Initial commit
Minor refactor and cleanup