Cleaned up networking moduled