Refactoring the code
Source formatting #30