fix CE and code style