More code-cleanup

:D