Cleanup as per Nicola Mometto's (Bronsa) suggestions