Alignment refactoring
More alignments and refactoring