General cleanup and prepping for commands.
Format fixes