Improving rpi.h