Refactored some to test Jenkins