Changed filter name and some code style compliance