Several minor changes aimed to make comments and code clearer, following the norms
Differential Revision: https://phabricator.kde.org/D29609