Cleaned up NetworkHandler a little.