Move `align` to helpers
Move align_types to helpers