Improve some code style parts