Refactoring on Splash