Updated copyright notice
Cosmetic refactoring.
Renamed members and changed member grouping