more code style changes