more good comments and cleanup