refactoring: two GUI marshalling methods replaced by single one