Cleaned up of bar and line charts