Removed longjohn package
Looking at refactoring helpers