added pypi pass
refactored Formatter