And reformat so that we don't have lengthy lines. Also simplify
some checks.
Signed-off-by: NNikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>