Converting coding style per peer review notes