Clean up. Ensure the log function is everywhere.