Refactoring/minimizing.