Added Regexs to Parsing Methods

Also replacing some magic values