Minor cleanup to spacing and comments