Refactored each to a simple selector with size