Modifying to match style guide