Deleted useless code
Added a few class comments