comments and some cleaning up