Improve regex somewhat