more code style cleanup