various code style fix