Refactoring. I think this is clear