Refactor

Signed-off-by: omar salem <omargamil@live.com>