Placed comments and removed unused stuff