cleaned up admin class
small touch ups