Updated code alignment