some cleansing changes