fix typo
clean code
add TODO
Merge branch 'billing' of github.com:Star2Billing/cdr-stats into billing