rm Supporter and Detr. classes
minor style changes
style