Fix minor code style inconsistencies