Cleanup

Wat cleanup van code.