Moved common functionality to util and updated marl-chords parser