Small amounts of code tidying