Clean up params filtering/parsing