Refactor, fix