Better commenting, cleans up for style points