Tweak spacing
Patched bad coding
Add information to the commit template