Clean up and refactor task partial for final touches.