Changed formatting to make it consistant across the entire project.
Merge pull request #1 from gardavi/master

Changed formatting to make it consistent across the entire project.