Cleaned up the midi classes to allow for further expandability