Code cleanup

Some code-cleanup.