a few style improvements