comment and code cleanup