Last Commit before sending to client

Mostly style updates.