Add license and clean up