Switched to guard conditionals instead of arrow-antipattern in splash method.