Update license header addresses.
Add supertype.
Cleanup formatting.
Update documentation comments.
Remove redundant static declaration.