Style guideline fixes