cleaned up viewtypes