pfRouter, code cleanup