Addtional simplification

Reduce the control code.