removed to do comment, optimizations