Tweaks to cleanup #2235

Fixes for all code review comments in https://github.com/learningequality/ka-lite/pull/2235