rearranged scene and cleaned up some code for multi pass rendering