Cleaning up convoluted screen start stuff