Actually follow style convention for cleanup