Some style cleanup