Improve statements RegExp; fix