remove old filtering; use more concise function for filtering data; explicitly declare colors