Minor modifications for consistency and fixed typo