Cleaning code + adding documentation on the new tpl engine