Minor formatting. Adding new types to remove array based structures.