Rely only on REMOTE_ADDR
Cosmetic changes