* Work around bug in gjs importer
* some minor changes to improve readability