Fix copyright header and some cleanup