Clean up glob code