Minor optimizations and comments fix :D