Clean up Excel wrapper code and fix Props1SI function

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>