Changes to improve consistency in code.