Minimal code refactoring.