code style rules fixed
more code style rules fixed