METAGEN-92 Some clean-up (comments, headers, unused imports, typos)