Clean up, add license