cleaning up piano refactoring