refactor

Signed-off-by: Felix Dumit <felix.dumit@gmail.com>