two more levels, a bit of commenting, and a bit of cleaning up