Some minor cleansing