cleaned up some dictionaries to just use objects directly