1. Small refactoring