Tidying up Rails Object queries