code tidy and small copy changes