Improve some code style