Refactoring stuff to splash