OGM-451 Improve code readability