Refactoring to allow for easy jarring