Minor cleanup, more in-code comments