Tidy up: remove underscores and old comments.