Revert "code Optimization"

This reverts commit ddc971dfe925bb8fd6011f1b629b13ff61572273.