refactoring, trimming some fat
refactoring, trimming some fat