Code cleanup
- added a few TODO markers
- fixed formatters test to behave correctly with Locale