Tidying Code a bit