More comments and clearer variable names