Responses to Code Review

- Removed NetworkInterface class
- Simplified code