refactor: update of remainign code

update of remaining code, which was omitted in
previous commit.