Some style improvments