splash added code refactor