Minor refactoring/cleaning.