Using instancetype where appropriate.
Updating file headers.