Formatting fixes and improved generic example