Cleanup and conversion of some methods into scopes.
Corrected change.
Gem updates