Clean up lazy variable names