Added new class Scenes
Cleaned some varibles