Make variable names more useful