Remove unused filter from previous implementation
Whitespace tweaks