Just a small refactor