Since these are utility methods, move them to the end of the class?