Some non-code tidying.