Removed most of the comments and put in the filters