Minor code alignments