Cleanup and add licencse