fix some code style and annotation