Added markers to whitespace removal