added comments and removed some classes