A bit of code tidying