Comment tidy-up, remove TODOs