*Updated cleanup & codetemplates