Formatting and copy fixes