Small changes to previous code (comments etc)