Scale Cleanup & added SceneScale