Cleaned up splash code a little