added some regex cleaning