Clean the code. Organize multiple types as dictionary.