WYCS: reasonable refactoring
WYCS; yet more refactoring.