Some refactor, prtty will now generate namespaces and add the end if they are there