quick cleanup of the installer code
updated namespace