address review comments:

- move comment to the correct place
- coding style fixes