Pad cleanup 1

This is the first of many input cleanups. This one is still WIP and I just want to see if it builds across all platforms.
Braces on next line