Added some regex and text processing for cleaner output when used as an acutal client