More regex fine tuning