Refactor Quadro