change some wordings + refactoring