Code cleanse

Cleans up the Installer.