Refactor usando Grape