Cleaned up host address code