some code style fixies