Clean Alignment

Ideas collected by Dylan Belyk-Seymour