Refactored install file