Small refactorings

Tiny changes :)