Small refactoring
checking