cleanup, added missing comments