Cleaning up, adding typedefs to classes