Small refactorings

Commit messages are descriptive enough.