Improve comments and clean up pt.2