Fixed format of dictionary, not sure what I was thinking here