Did some formatting changes

It was bugging me :P
Merge pull request #1 from yasithv/master

Some formatting, and removing of lots of new lines.