Housekeeping

Update wording, whitespace cleanup and update copyright.