Refactored tap processor