Removed unused dependencies. Added comments and removed comented code.