refactor alignment adjustments