minor tidying, since align is now a subpackage