Minor chart refactoring