Cleaning up some code by adding Scenes