CodingStyle cleaning