Restructure utility methods, no destruction