Refactored the PicowattAVS47 instrument