Interim commit
Refactoring and indenting