Fix c&p error and some codestyle