Alignment initial refactoring