refactoring: trimming the fat