Add additional classes to demonstrate filtering

Also made some formatting changes