Minor changes to adhere to codebase conventions.