Add destroy task and minor tweaks to naming