[OLINGO-356] Minor code clean up