Fixed commenting, final while loop