minor_refactor