general comment and code cleanup