Improve code
Fix Lint warnings on NFC
Add real IP address info and optimize code
Remove TODO
Fix indentation