Shortened regexes, added makePrice function