No ticket: fix code style inconsistencies