[OLINGO-422] Minor code refactorings and fixes