refactoring

aka breaking JSC