Update 2.1

moved formatting into a different class (Untested if works)