Recleaned formatting of dictionary :P