typo fix and changes for consistency