added percentage and fantasy type + cleaned up code