made changes based on review from Gnome https://extensions.gnome.org/review/2781