Beautification
Beautification 2/3
Beautification 3/3
Merge pull request #1 from mamoit/manual-changes

Beautification