align refactoring