Remove comment; rename namespace setup function