BlueJ isolation + small refactor