comment clean up and format issues