Cleaned up contrib flow logging