Formating cleanups refs #13