Refactored helper methods in a helper class