doCheck added, comments removed