Little refactoring changes.