Tidying up, also added license