Some style fixing