small refactorings
Merge commit '018ec354e0f3fd3ce772327d047114115bb01218'