improved a few style checks