Minor cleanup
Switching dictionary to return values in python dictionaries instead of tuples