Improve regex's
Remove un-needed title