rename to SCENE_BUILD and performed some code cleanup