Geometric constraints: a refined model for the structure of silica glass