Refactoring for 80 char line lengths