Cleaned up code and altered scene allocation super call location to the ...

...beginnings of the methods where it should be.