Clean code and fix 2.0 output