Refactor custom axe class