Filters and classes laid out in a readable manner. Added classes for type in case we ever decide to do something with them.