Franchuti getting started refactor