remove unrelated whitespace changes; don't redefine duplicate class methods