Misc commits

Clean up of `align`