Change formatting to align to the codebase style