Bug 23964: (follow-up) Add comments and improve readability