Re-factor to make it more concise.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>