Code Refactoring

Signed-off-by: Yasser Aziza <yasser.aziza@gmail.com>