Cleaned up IntExtractable