Annotations Tools: spacing and comment fixes - will be squashed