#912 Small refactorings