Made Window deserialiser return raw pointer
Tidying up