Moved Formatting to Helpers