improve controll

simplefy code