Code cleanup and comment typo fix