Clean up variable names and their documentation