Reorganized utility methods