Fix copyright header
Clean up