[RFR] Fix some code style issues