Cleanup for review issues.