Refactoring + delete massive of unnecessary chart code :)