Slight clean up of splash calls, use HZ instead of explicit numbers