Add missing copyright info in the new classes
Minor code reformatting