Fix some quotes
Convert class method to scope