comment changes, code cleanup