Make more pythonic, update license