Refactor maker.sh
More refactoring
More refactoring
Check-in before work