added comments and removed unused classes