Code style guide fixes