Some style/formatting fixes