[OLINGO-335] Run Code cleanup