Edited PianoRoll refactoring (1c)