Performance enhancement. Reduce call stack
Fixed comments