Refactoring/cleanup.