Change key formatting to return