refactor code
Merge branch 'master' of https://github.com/alxndr-k/Charts