Refactoring ....

Signed-off-by: Kevin Nguyen <k.nguyen@thecodingmachine.com>