cleanup and comments since i was hasty