Cleanup and updated license