Code and music refactoring 2