@datibbaw Yes, since you're already refactoring it, would be nice to make it clean.