tidy-ed + a couple missing comments