Instruments refactoring