fix, refactor