Refactored Let, If