Added better comments to static handler