code style
improvements