Refactor: prep work for killing new-line atom
push cantus-firmus atom into one place
general cleaning