Refactoring
Refactor part deaux.

Signed-off-by: Fenny Fatal <fenny@fennyfatal.com>