Task cleanup and added documentation