Clean up & attributions
Clean up