style cleanup and unit tests for namespace filtering added