instruments refactor