deleted - awful RegEx pattern, some refactoring