Merge pull request #160 from rjynn/newBranch

changed some code styling issues for readability