Final changes for review after refactoring comments and removing unused code.