Refactor
FIX formatter+list issue
Update version to 2.2.0