Code cleanup
Media charts and others