Cleaned commented code
Added one more regex