Separate out utility methods from debug methods, and update headers