Fix coding style to comply with style guidelines in CONTRIBUTING.md