Code cleanup, comment refactoring