Some cleanup and updates
Replaced find_by_* calls