OCD'd some commenting