Tidied up Adafruit libraries