Coding style fixies