Cleaned up namespaces with the slamhound plugin