Refactor refactor refcator