cleaning and fixing the views