Wrapping up tag refactoring
cleanup