Beautify
Remove extra padding.
Merge branch 'PeacockCleanup'