made regex slightly simpler