fix #2, clean up some formatting