refactor instruments