Code cleanup
Added partial network features