Make variable names more Pythonic