Rewrite of CDA and removed universal commands. Also better identation and style for lists