Refactored then statements