Cleaning up instrument properties builder