More spacing and alignment
Merge pull request #18 from slvnperron/master

More spacing and alignment