Refactored code alignment