cleaned up dictionaries a bit