This was being too overzealous marking everything as an error so I made it less greedy