A few style asjustments