Updated to remove unnecessary logic.