Clean up scene definition a little.