Code (mostly comments) cleanup