Additional Refactoring. Fixed small bug associated with current network selection.