comments and small clean up