Attempting refactoring
Attempting refactoring. 2nd time