Slave-side code cleaned up. Waiting for RPi-side clean-up.