Minor fixes: improve wording, fix whitespaces, minor refactorings