CS: fix some code style inconsistencies