[OLINGO-356] Clean up code and fixed typos