Use TaskHelpers and clean up formatting.