Start work on cleaning up

Goal is to add support for chords and other music stuff.