Minor cleanups
Minor cleanups

tabish121/quiver,ssorj/quiver,ssorj/quiver,tabish121/quiver,tabish121/quiver,tabish121/quiver,tabish121/quiver,ssorj/quiver,tabish121/quiver,tabish121/quiver,ssorj/quiver,ssorj/quiver,ssorj/quiver,ssorj/quiver