Refactor. Remove the query 'select *'