imporve code style