#13 Small refactoring