Refactoring work.

Signed-off-by: mateusz <kontakt@mateuszmidor.com>