Formatting to match original repository