Tidied up code in the installer file