Shortened code using the Filters class

Used the filters class to shorten down the code.