small refactor
Merge commit '85613a2103bd5930522f112ebe38c0b6525fe738' into setuptool