Remove massive use of regexp that can be long
Bug fix. Optimize