Refactor scene constructor

It was really messy