Minor code cleanup and editing for consistency.