Cleaned up formatting of dictionary