Added comments and removed debugs