Revert "Improvements"

This reverts commit a44fde4d74da37e881856cb97a554b07e54255b3.
Merge https://github.com/TomUB/Guitar