Adding namespace and license support as well as cleaning up output.