Cleaned up #8.