Small Refactorings.

... for cleaner code.