Refactor Application Start