Tighten annotations and other comments