Refactor location of utility methods