Cleanup installer code, and bring into line with the KwaMoja coding guid...

...elines