trakBan regex fix, refactoring