Cleanup and upgrade to MIT License