refactor lib: remove extra property
refactor lib: simplify option handling a bit
Merge branch 'refactor-path-handling' into develop

* refactor-path-handling:
  refactor lib: simplify option handling a bit
  refactor lib: remove extra property