CodeStyle improved