continue to fix little bug and code style