Handle T=10 instead of supporting 10 numeral
Refactor to improve readability
version