Minor (tiny) optimization, better comments