Clean code & fixed
fixed & clean