A few style changes