[OLINGO-350] Minor code clean up