More code-cleaning-up.