Improved coding style (2.9 part 1)