scene cleanup
Merge pull request #5 from ChristophHoltmann/refactor

scene cleanup