cleanup and added filters