Minor optimization and revert from + to *