Refactor axis into brush and scatter