Some CodeStyle fixes