mostly comments and code cleanup