Remove extra spacing
Make keys the right way