filter - cosmetic changes to code