Updated copyright info
Minor code/comment cleanup