Misc tidying
Condensed function calls in install script