Refactored a couple more utility methods to the static utility class - makes more sense.