Refactor to meet standard coding style.