change code more pretty