clean up some formatting/comments