Clean up syntax with named scopes
Clean up styles with rubocop