refactoring from Peter Lawrey
2 files changed