Minor cleansing for better debugging