Re-factor tasks