Began commenting, cleaning up.