Some small refactor