change code style to better