Initial commit
Refactoring and better naming convention