[OLINGO-328] refactoring
[OLINGO-328] refactoring
[OLINGO-328] refactoring, improvements & fit