Add comments; rename namespace