- Little refactoring cleanup.