- made hardcoded constants explicit
- made the code more readable according to OAI coding style guidelines
- fixed some formatting and logging