Bugfix, refactor mishap
Merge pull request #10 from shrayas/clean-up

:laughing: 

merged