more code style improvements