Some style changes...