Quick cleanup, getting tests to pass and formatting
Removed type parameters from axis.Descriptor. general restructuring of axis.