Tidy up the code

Tidied up the code by defining typedefs for long typenames, reorganized
code to remove need for forward declarations, factored out some unused and
redundant code.