avoid using void* where it is not necessary, minor cleanup