Refactoring

Signed-off-by: Ventsislav Dimitrov <wencislawdimitrow@gmail.com>