Fixed the issues in PR 751 regarding language inconsistency and white spaces