optimize installer code, clean up strings