jsHybugger refactoring - preparation for next project phase