Cleaned up code, updated dictionaries.