Refactored classes to use ``super`` where applicable.

This just a start - will be updated.