Improvements from review

Signed-off-by: Alex Tugarev <telekom@tugarev.de>