Charts - Code Cleanup and linting