refactored findAll