Smooth launch and refactoring