Minor code cleanup, filter specs structured.