Fixed some unnecessary code change