Variable names now make more sense