a Littele refactoring