org content, refactor pop chart, clean data