Style fixes and copy changes