repair use
remove unnecessary assigned
short to swich syntax