Fixed some style and alignment
Merge pull request #37 from johann8384/master

Fixed some style and alignment