refactor something
continue refactor