QuickStart refactor