Refactoring and style.
More regex finetuning in context
More regex fine tuning