Format cleanups refs #44