chart enhancement, refactoring