Cleanup function names, cleanup variable declaration syntax