Even more code tidying