Small changes, making functions better.