Some cleanup and added a Facade class to simplify access to tagger