Removed regexp. Using basic string functions instead