More optimization with inlining
Minor optimization