avoid some compiler warnings, and a cleanup

Both pretty inconsequential so feel free to ignore