resolve #13 refactor Scene