Refactoring

Signed-off-by: Martin Bastien <martin.bastien@studiofrenetic.com>