Removed dead catalog helper function
Tidied header order and documentation
Continued SPI rework