Refactor booleans. Refactor mavericks verification.