optimize
some codestyle change
bug fixed