Some style changes and small changes to replace defaults.