Massive commenting, cleaning up