A few style improvments