Final installer script tidy up

Final installer script tidy up