whitespace cleanup. removing confusing comment. misc cleanup.