TRQ-1054: fixes after code review

- add comments
- check coding standard