Merge pull request #180 from Yahkob/styleRefactor

Style refactor