small optimization and comments