Refactored a couple of methods to satisfy Jenkins