Some small refactorings

Nothing too fancy :)