Changes to adhere to style guide