Cleanup
FIXED macro no longer classifies String as a class instance