Updated RegEx-es, Might Break

Used Capture Groups to Capture Necessary Values more effectively than
splitting and re-matching
Added Utility Methods