refactored filters to comply with code conventions