Mechanecal refactoring.