antonhornquist refactor