Refactoring

Signed-off-by: Carel <dutoit.carel7@gmail.com>