Some code alignment and comment corrections.