minor naming fixes.
speedup type converting about 5x faster.
Formatting, add space " " after each comma "," .