Basic Cleanup, Change 'SPI' to Spi and tightening some generics

Not really functional changes, but my IDE is happier...