Refactoring.

Signed-off-by: flozzone <flozzone@themachine.(none)>