Tidy-ups and commenting