Refactor

Signed-off-by: guneysus <serefguneysu@gmail.com>