cleaning up some formatting, comments, etc