Cleanup
Small refactorings