Cleanup based on Brittany's PR comments