refactoring according to code review

- split out GetOptionsAndEntries, FillEntriesDefaults
- no snake_case
- add missing bnc reference
- unify indentation
test the refactoring. caught a corner case
.changes