Tidying up formatting