refactoring. I make it more laconic