Tidying up. Proper license