Some adjustments on code form, but not function