also add some code refactoring
approved this merge request
unapproved this merge request
mentioned in commit e9596297
merged