Finish commenting, cleaning up code