fix some inconsistencies

- code review updates