comments and code clean up pre-handoff