Enhanced for clarity