Tidying up, removing warnings