Cleaning up further coding style inconsistencies that have crept in