Fix comment typo and more codestyle fixes