Altered filtering method & cleaned up code