Small refactoring pt. 3