Clean up net code
Clean up Window class