Minor code style and comments improvements