Refactor C code to hopefully reduce/eliminate warnings on compile