Formatting fixes according to Paul comments/suggestions on previous pull request (pt2)