Formatting changes. Remove Dictionaries.