Refactoring style
More style refactoring and starting on scripting for scenes