code guideline fixes