- Separate node list loading from connecting - Put code in its own source file - Rename a few functions