minor refactoring on install class