CodeStyle fixes