Splash refactoring