Very small amount of tidying up code