Minor modifications for style