Small refactoring#2