Refactoring to make require statements more straightforward