Some very small refactor