Better documentation, better variable names