Clean up and added license.