minor comment cleanup, added todos for refactoring