Small refactorings
Cleanup