Refactored AngelStartUp class