Refactored

Signed-off-by: Paul <pauldingle@sub.tv>
f

Signed-off-by: Paul <pauldingle@sub.tv>
done

Signed-off-by: Paul <pauldingle@sub.tv>