Be DRY - moved common code into single method