Minor code alignment changes changes