Fix comment and code style