tidy + added some regex