Cleanup deserializer code

This PR includes style fixes, removes unneccessary variables,
scopes, checks and the like.

Pair-programmed with @manuelmessner