Project cleanup; updated copyright