Slight cosmetic changes to source to match order/comments.