Cleaned up network mode in parser