- Refractoring

Signed-off-by: Wassim Dhif <wassimdhif@gmail.com>