shape up some redundant classes