Some code style guideline improvements