made the filtering way prettier and cleaner