some refactoring
more refactoring, scenes