Clean up

Cleaned up fwd.c

Concerns with how we are passing IP address in header compared to how
other groups may be doing it.