Code Cleanup
Begin to test filters