Minor modifications for consistency