[0.0.37m] code style cleanup - part 1