code tidying.