Small refactoring pt. 2