formatiing changes and name changes