Fix SFINAE
Cleanup