Clean up before filter, fix typo