raytrace.cpp cleanup