Clean up if - strategy