Clean up!

Tabs,indenting,and unused filters.