Clean up and add license