Avoid possible proxy resolve lag.
Fix.
Refactoring.
Cleanup.
CodeMaid cleanup.