Sample: minor updates to modernize