Adjusted based on style guide