Move Percentage Formatting into Number Formatting

Ref #10