followup: code comments and small "cleanups"