Cleaned up net code